return if the widget that originally received the event is a notebook

2006-12-29  Carlos Garnacho  <carlosg@gnome.org>

        * gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that
        originally received the event is a notebook page. (#315440, reported
        by Mateusz Stefek)

diff --git a/ChangeLog b/ChangeLog
index b11d82f69147d51cb1f8d8803400aa408890773a..a2bfd3b0ac77868e331e17bb11d85329d05ecb09 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-29  Carlos Garnacho  <carlosg@gnome.org>
+
+       * gtk/gtknotebook.c (gtk_notebook_scroll): return if the widget that
+       originally received the event is a notebook page. (#315440, reported
+       by Mateusz Stefek)
+
 2006-12-29  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/gdkcolor.c (gdk_color_hash): Fix a typo. (#390613,

diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index 23abb5921774eab1b0e5c79f0f1d7f4a62924f0d..9f8d14ed00a744845dd22b60f37c84738b533909 100644 (file)
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2301,7 +2301,7 @@ gtk_notebook_scroll (GtkWidget      *widget,
   originator = gtk_get_event_widget ((GdkEvent *)event);
 
   /* ignore scroll events from the content of the page */
-  if (!originator || gtk_widget_is_ancestor (originator, child))
+  if (!originator || gtk_widget_is_ancestor (originator, child) || originator == child)
     return FALSE;
   
   switch (event->direction)